xilinx: Move ipi configuration structure definition to header file

Move ipi configuration structure definition to common header file
and rename it to common name, so it can be used for Xilinx specific
other platforms in upcoming changes.

Signed-off-by: Tejas Patel <[email protected]>
Reviewed-by: Siva Durga Prasad Paladugu <[email protected]>
Signed-off-by: Jolly Shah <[email protected]>

diff --git a/plat/xilinx/common/include/ipi.h b/plat/xilinx/common/include/ipi.h
new file mode 100644 (file)
index 0000000..c9fd8d1
--- /dev/null
+++ b/plat/xilinx/common/include/ipi.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2018, Xilinx, Inc. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/* Xilinx IPI management configuration data and macros */
+
+#ifndef IPI_H
+#define IPI_H
+
+#include <stdint.h>
+
+/*********************************************************************
+ * Struct definitions
+ ********************************************************************/
+
+/* structure to maintain IPI configuration information */
+struct ipi_config {
+       unsigned int ipi_bit_mask;
+       unsigned int ipi_reg_base;
+       unsigned char secure_only;
+};
+
+#endif /* IPI_H */

diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk
index 35c8983cdb1928a0a3629f1cfd2ad905b2f7d74f..a4ffd6cebbc00d356d1d1ba17e9427730bdea48b 100644 (file)
--- a/plat/xilinx/zynqmp/platform.mk
+++ b/plat/xilinx/zynqmp/platform.mk
@@ -47,6 +47,7 @@ endif
 
 PLAT_INCLUDES          :=      -Iinclude/plat/arm/common/                      \
                                -Iinclude/plat/arm/common/aarch64/              \
+                               -Iplat/xilinx/common/include/                   \
                                -Iplat/xilinx/zynqmp/include/                   \
                                -Iplat/xilinx/zynqmp/pm_service/                \
                                -Iplat/xilinx/zynqmp/ipi_mailbox_service/

diff --git a/plat/xilinx/zynqmp/zynqmp_ipi.c b/plat/xilinx/zynqmp/zynqmp_ipi.c
index 96f2b9c3b18741410ca734b1dfa1d0f2de3e7468..ac84e0b7364b482006eec5aad8e44f0ffec77e2b 100644 (file)
--- a/plat/xilinx/zynqmp/zynqmp_ipi.c
+++ b/plat/xilinx/zynqmp/zynqmp_ipi.c
@@ -15,6 +15,8 @@
 #include <common/runtime_svc.h>
 #include <lib/bakery_lock.h>
 #include <lib/mmio.h>
+
+#include <ipi.h>
 #include <plat_ipi.h>
 #include <plat_private.h>
 
@@ -44,19 +46,8 @@
 #define IPI_IS_SECURE(I) ((zynqmp_ipi_table[(I)].secure_only & \
                           IPI_SECURE_MASK) ? 1 : 0)
 
-/*********************************************************************
- * Struct definitions
- ********************************************************************/
-
-/* structure to maintain IPI configuration information */
-struct zynqmp_ipi_config {
-       unsigned int ipi_bit_mask;
-       unsigned int ipi_reg_base;
-       unsigned char secure_only;
-};
-
 /* Zynqmp ipi configuration table */
-const static struct zynqmp_ipi_config zynqmp_ipi_table[] = {
+const static struct ipi_config zynqmp_ipi_table[] = {
        /* APU IPI */
        {
                .ipi_bit_mask = 0x1,